Corrections of Stream.Find, FindUntil and added FindMulti - like AVR-Core Libraries #3442
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Find has some bug that is not working with Ethernet.find() so, I copied code from Stream.h and Stream.cpp in AVR-CORE library and now it's working perfectly.
I don't know where was the error, but an Ethernet.find compiled to MEGA2560 was working but not working when compiled to esp32, after corrections of code (copy of AVR-Core libraries) it's working perfect.
So probably has some error on original ESP32-Core library.
Below is part of code that was working with MEGA2560 and not with ESP32 libraries.
client.find never return TRUE with ESP32 original library and with AVR it's works.
boolean esp32_fw_update(EthernetClient &client, DecodedHeader &header, const String &field_filename, const String &field_crc) {
char bound[header.boundary.length()+3];
char term[]="\r\n";
strcpy(bound,header.boundary.c_str());
strcat(bound,term);
while (client.find(bound)) {
String line=client.readStringUntil('\r');
atanisoft
reviewed
Nov 1, 2019
cores/esp32/Stream.cpp
Outdated
| @@ -85,7 +85,7 @@ void Stream::setTimeout(unsigned long timeout) // sets the maximum number of mi | |||
| unsigned long Stream::getTimeout(void) { | |||
| return _timeout; | |||
| } | |||
|
|
|||
| /* | |||
There was a problem hiding this comment.
instead of leaving a lot of dead code behind, just delete it.
cores/esp32/Stream.cpp
Outdated
| // ******************** ALEXANDRE | ||
|
|
||
| // find returns true if the target string is found | ||
| bool Stream::find(char *target) |
There was a problem hiding this comment.
you should restore the const signatures for these methods.
There was a problem hiding this comment.
Const signature was not there on original AVR Core code.
cores/esp32/Stream.h
Outdated
| bool findUntil(char *target, size_t targetLen, char *terminate, size_t termLen); // as above but search ends if the terminate string is found | ||
| bool findUntil(uint8_t *target, size_t targetLen, char *terminate, size_t termLen) {return findUntil((char *)target, targetLen, terminate, termLen); } | ||
|
|
||
| /* |
There was a problem hiding this comment.
same here about dead code and retaining the const signature updates.
There was a problem hiding this comment.
I leave this code to Espressif decide what to do. About const it was not there on original AVR Core code.
There was a problem hiding this comment.
unless the code modifies the chars, they should be const. Regardless if that is on AVR or not :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Find has some bug that is not working with Ethernet.find() so, I copied code from Stream.h and Stream.cpp in AVR-CORE library and now it's working perfectly.
I don't know where was the error, but an Ethernet.find compiled to MEGA2560 was working but not working when compiled to esp32, after corrections of code (copy of AVR-Core libraries) it's working perfect.
So probably has some error on original ESP32-Core library.
Below is part of code that was working with MEGA2560 and not with ESP32 libraries.
client.find never return TRUE with ESP32 original library and with AVR it's works.
boolean esp32_fw_update(EthernetClient &client, DecodedHeader &header, const String &field_filename, const String &field_crc) {
char bound[header.boundary.length()+3];
char term[]="\r\n";
strcpy(bound,header.boundary.c_str());
strcat(bound,term);
while (client.find(bound)) {
String line=client.readStringUntil('\r');